Modified for hot fixes