Sync up with current environment and reformetted by new implementation.