WIP: Attempt on changes
WIP: Minor changes