Cleaned up working code