Made functions public - fixes