Small changes and put everything together