fixed init - added modules