small stuff on implementation (needs to be checked)