Few more changes, its late and I need coffee