just a few refinments...