Added form and reformating