Commented out the currently irrelevant stuff