switched back to shapes because of permance issues