Need to modify serve with compass