Luke's changes added