correctly formated and near final version