added trantor, cleaned up