small changes, all funtional