Latest with some correction & code resolution