Added last stuff working