Project update

Changed project again for easier implementation