Change way to implementation