added dynamic objects, think its working the right way