Done, just making interactions nicer