Removed validate and added more content in general