Further elbow part 1 modifications

abugabugabuga