Sync up with current environment and reformatted by new implementation.