Commented out unnecessary stuff for now