Softened Sebastian's hard-code

Signed-off-by: Michael Zemsky <zmike808@gmail.com>