beautify and make work for existing suite