Refactored code, changed Effect to Tila