Few other changes and ideas