Moving to full working system