refacturing completed
Check point to do slide n fade
conflicts