small changes pending response from :marcoz