Improved guardfile