Updated to general format to be used