All functions revised, everything apparrently working...