#27 Reverting changes