bugfixing and ommitting