added a5
merged stuff