BalajiN | #0 | Fixing bugs