small changes
moved to install phase