shortened assembly even more