Redone -improvements