last modifications

needs merge to one file