WIP: Trying to make it more robust