Cleaned up the fact that Shape now doesnt work