Apply few things from Adam Umiastowski