Added new code from basement