applying changes to match 'working' conditions of live server not interrupting development line too much