transition added + some more changes