Added new function, closer with other things