Initial Fixes
Delete