removed constants, hardcoded values