Added 2.5 D support