just refined few things