Small changes to make more dynamic