More work on making it error proof