Moved to fully dynamic system

Also fixed simulation parts