Fixed issues iwth aw_data