copying in updates from main project