Some additions, not working yet