changes due to fast refactor