Resolved all Logic and Codes problems