mod - dotcloud ready version