Updated to newest modification