added support for non-quad systems