Forked for improvements