changes to be server ready