Adding Lucas' changes to the views