little refactor
merge with dev - conflicts resolved