removed exception
added magic method