last minute tweaking!!