all new changes so it works with new validation and new layout