More work on form