Most recent update after resolving all bugs :)