Last changes before making it into Wordpress