Version 1 after removing some build errors