Added forms and con tuned coding