Small changes and begining to prepare for favorites