Implemented new stuff