fixing businesslogic