Implementing laura's changes