Pla 217

Hey, please take a look if these changes are feasible. Pull request only for review, do not merge.