Updated to fit in both the console and server