changed order now works