Removed some math stuff and added Transform