i guess it's probably fine though, will implement improvements for feature 14