Initial commit, modified plugin