WIP: Updating robust interface
Multiple bug fixes