Fixed missing code. removed debug information