Started over, uglified and added content