merging with awp code