Changed annotation and some other code. WIP