updates from original project