Final version

Final version without debug messages.