Some improvements again