Concluded first version of whap