More work on svg