Removed comments and finished NExtra geo