Currently fixing some bugs with single file