Added alpha handling