More work on Solar Panel