Changed code to not use