fixed more stuff for new dimension