Cleaned up main with Gilbey