Streamlined the whole project