Initial suggestion would be the following (note that most of these are already in place):