minor changes to help easy deployment