Fixed sychronization issue and added Obs to neaten up files