Adding all previously existing code