changing lucas' suggestions