Renamed
Removed debug stuff