FIXED requires and removed debug info