cleaned up even more... so much shorter