...also the original code was retarded