Last tweaks for version 1.0. promise