more assembly work, works :)