added crazy girl
merge
crazy girl changes
merge