Sett & Charles - refactoring for running on apache