Changed forms a bit