added crucial stuff...