Redone some Commiting, Fixed Artifcat