Removed junk, implemented v1 version