changed to allow upper lower to work properly