updates to finish the public section