made more observers, solved problem with wrapping