Update: New tested methods