Removing duplicate functions and hopefully fixing point/follow issues