Updated changes to alpha4

@sayedihashimi