updated and merged changes