Latest updates from the original project