Changed setup as suggested