Updated with #6 done