Updated alpha handling