Few here and there modifications..