squashed commit message

second squash attempt