some changes. aa still broken.