Plugin Fixed, Testing in progress!