Trying to get code stable again