Mihir | #AQS | Better code