Changes made after feature review