amorphs adding cleaned up