Added better functions