Functionality improved, better organization