Latest updates from server

Pre productioin