Added some checkage