separated geometry code from the rest
separated geometry code from the rest