Improve and/or creation #592