More Done, Changed some function(s)