Removed ToDo. Added credits