Final version for submit (fixed some type-o's)