Cleaned up the configuration to work in circle