Edited develop version