applying Soles suggestion
applying Soles suggestion - complete