Amended again >.>